Clone scene fix #3032 - pull request friendly

Referenced #3032 from 2 different branches, but previous one had unnecessary/non-relevant commits. Remade in this branch for convenience.