Revert topic.
Merge topic 'target-objects-refactor' into next

600f3bcc Revert topic.