Clone children when returned to prevent modification + add missing upd object to child before calculating price (cherry picked from commit 5ffedfa91ae86735868b6202d9e0b33bb37ef5e6)
Clone children when returned to prevent modification + add missing upd object to child before calculating price (cherry picked from commit 5ffedfa91ae86735868b6202d9e0b33bb37ef5e6)