Revert "Re #8717 Cleanup commented code."

This reverts commit e2f37c69530e2fe48ac2a9f09049db29d92ffa65.
Merge branch 'feature/8717_copy_clone_pmap_and_component' into develop