aw4-l07 #228 (aw4-l07)