aw3-c11 #1638 (aw3-c11)