bionic - Revision 63978: /airapps-fixes/trunk