aw4-l10 #817 (aw4-l10)