Merge branch 'backport-target-objects' into release-3.27

Merge-request: !8974