bionic - Revision 88993: /airapps-fixes/trunk