4.0.8 release
Merge branch 'QA_4_0'