Update Master Branch to official community release 4.0

Update to 4.0