aw3-c11 #1597 (aw3-c11)