aw4-l04 #535 (aw4-l04)