Merge branch 'cherry-pick-3d75f3fc' into 'releases/3.4'

Merge branch 'feature/remove-deprecation-warning-from-mapper-update' into 'master'

See merge request !2714