Merge pull request #6297 from CarolEidt/MorphGenTreeRefactors