Merge "use _deprecated suffix for deprecated clipops"