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