Merge branch 'release/4.0.0'