Merge branch 'bug23318-redux_029' into maint-0.2.9