Merge branch 'maint-0.3.5' into bug40133_035