Merge branch 'hotfix/1.1.1'
initial changes to get tests passing
Merge branch 'api-v-1.1-upgrade' into develop