cw-hc-04 #717