aw4-l10 #1633 (aw4-l10)