Updating Develop

This pull request is to update develop with the latest 2.3.7 release changes that happened in release/candidate.