aw3-c11 #1594 (aw3-c11)