Remove unnecessary change.
Merge topic 'target-objects-refactor' into next

c16b481c Remove unnecessary change.