Merge collector motor stop() updates