aw4-l10 #1629 (aw4-l10)