Merge branch 'wip/backport-ecc9366a0e0db107c286935130837b2222e2dd82' of https…

Authored by bgamari on Tue, Jun 4, 5:03 PM.