Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8

This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the
cherry-picked fix of 18490