bionic - Revision 89063: /airapps-fixes/trunk