move changes enabling single point error and message prefix and suffix assignment into fork