Merge "Fix clip area behavior for REPLACE op" into mnc-dev