Revert "Revert "Version 4.0""

This reverts commit 20d0974e396e2f81a46ce7778cff8a07e188fc78.