Merge pull request #3119 from nabinhait/v4.x.x

Reset no-copy fields for recurring docs and patch to fix