xenial - Revision 8970: /airapps-fixes/trunk