bionic - Revision 88942: /airapps-fixes