aw4-l07 #629 (aw4-l07)