[#75777002] update to repair breakage from latest rebase