A pull from the CGM Remote Monitor Develop Branch