Develop

Merging the latest change from the Develop branch into Diabetes Specialty for Patient View