aw4-l07 #237 (aw4-l07)