aw4-l10 #824 (aw4-l10)