Merge branch 'bug40133_035' into bug40133_043