4.0.6 release
Merge branch 'MAINT_4_0_6' into QA_4_0
Fix merge conflict
Merge branch 'QA_4_0'