Merged in pull requests from Develop
Merged in pull requests from Develop
Merge remote-tracking branch 'origin/feature/diabetes-all' into feature/diabetes-all