Merge branch '106-update-the-api-to-address-the-new-resource-state-model' into 'develop'
Resolve "Update the API to address the new resource state model" See merge request !110
Resolve "Update the API to address the new resource state model" See merge request !110