Merge "Prevent unnecesary Surface preservation." into oc-dev