bionic - Revision 88949: /airapps-fixes/trunk