bionic - Revision 89132: /airapps-fixes/trunk