from branch cloneMaster
ClassForCloneMaster
after merge