aw3-c11 #1589 (aw3-c11)