cw-hc-05 #679