Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9