Merge "Avoid unnecessary work." into sc-dev