xenial - Revision 8951: /airapps-fixes