aw4-l07 #663 (aw4-l07)