Merge develop branch in to feature/diabetes

Merge develop branch in to feature/diabetes