aw3-c11 #1633 (aw3-c11)