[#58511632] copy changes