bionic - Revision 89070: /airapps-fixes/trunk