bionic - Revision 89087: /airapps-fixes/trunk