aw3-c11 #1635 (aw3-c11)