[DF-32]: Fix: components cloning