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

9be2b428 Revert topic