merging some release branch changes to development from master