Retag tools under provisioning to cm, references #32