Pushed most of the changes for the v3.6.0 release