Fixed issue with stored endpoints being indexed numerically, which had changed to strings
Merge branch 'develop'