aw4-l07 #817 (aw4-l07)