aw4-l10 #1730 (aw4-l10)