[Bug 23394] Cherry-pick reference update into CR