[#68570426] copy changes