Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev