aw4-l07 #659 (aw4-l07)