manifest: bumped to 4.0.0
Merge branch 'dev'