Fixed Issue when modify record that has new_with_id set to true causes it to fail
Merge remote-tracking branch 'origin/hotfix-7.1.2' into hotfix-7.1.2