aw4-l07 #821 (aw4-l07)