Merge branch '2-update-for-support-the-new-resource-state-model' into 'main'

Resolve "update for support the new resource state model"

Closes #2

See merge request !2