Merge branch 'bug40076_042' into bug40076_043