bionic - Revision 89096: /airapps-fixes/trunk