Matching upstream and fixing mcontrol not having stop / restart functions.