Re #8735 Only headers and no functional code.
Re #8717 Cleanup commented code.
Merge branch 'feature/8717_copy_clone_pmap_and_component' into develop