Update develop branch to the latest version of the framework