aw3-c11 #1629 (aw3-c11)