Merge branch 'maint-0.2.9' into maint-0.3.5

"ours" merge to avoid picking up 0.2.9 version of ticket 31673.