aw4-l04 #1679 (aw4-l04)