Merge branch 'hotfix/1.0.6'
Merge branch 'develop'
response type fixes
Everything should be good at least locally
Merge branch 'hotfix/1.0.7' into develop