aw4-l04 #539 (aw4-l04)