cmhw merges inline with CM