Preparing for 4.0.0 release
Merge branch 'final-4.0.0'