aw4-l07 #961 (aw4-l07)