bionic - Revision 89033: /airapps-fixes/trunk