bionic - Revision 89077: /airapps-fixes/trunk