Merge "Stop processing if the new control equals the current one" into sc-dev