Merge branch 'maint-0.2.9' into maint-0.3.1

"ours" merge to avoid conflicts with the cherry-picked fix for 24898.