DF-4862 fixes, serilization, clone