Merge branch 'bug18841_1_025' into maint-0.2.7