aw3-c11 #1639 (aw3-c11)