Enhanced clone and added test (cherry picked from commit d3bbbb2)
Enhanced clone and added test
(cherry picked from commit d3bbbb2)

hackerrdave/supertype,hackerrdave/supertype,selsamman/supertype,selsamman/supertype