Re #8717 Fixed Build.
Merge branch 'feature/8717_copy_clone_pmap_and_component' into develop