Merge branch 'bug7065_v2' into maint-0.2.4