[#68564228] copy changes