Merge branch 'release/3.5.4' into dev
Import changes to parent method
Apply sf2.3 updates to copy method
Revert "Import changes to parent method"

This reverts commit c80961cd97eb2e7b80b7cfe09333b00d749633cc.
Merge branch 'refs/heads/dev'