cw-hc-05 #669