aw3-c11 #1669 (aw3-c11)