bionic - Revision 89122: /airapps-fixes/trunk