aw4-l07 #337 (aw4-l07)