Merge "Fixing assignment issue from clone()" into sc-dev