bionic - Revision 89074: /airapps-fixes/trunk