Merge "Simplify the return condition in stop()" into sc-dev