Merge branch 'bug18616-v4-merged_028' into maint-0.2.8