bionic - Revision 89064: /airapps-fixes/trunk