Merge branch 'bug21394_029_redux' into maint-0.2.9