Re #8710 Solve warning.
Merge branch 'feature/8710_copy_clone_pmap' into develop