aw4-l07 #1588 (aw4-l07)