Merge pull request #974 from arjantijms/4.0.0-prepare

4.0.0 prepare