Updating the branch with latest fixes for release