To fix it, please cherry-pick 6a6bb768c6542d738a8b2b6da282159a65ed611d to 3.5.
Jeremy, can you please review and when you're fine reassign to Karolin?
Looks correct to me. Re-assigning to Karolin for inclusion in release code. Jeremy.
Pushed to v3-5-test. Closing out bug report. Thanks!