Merge remote-tracking branch 'origin/develop' into 12-update-the-models-to-address-the-new-resource-state-model
