Allow user to specify resource type when adding a resource to content metadata
Fixed merge conflicts in README and version
Merge branch 'rel/3.22.1'
Merge branch 'rel/3.22.2'
Merge branch 'rel/3.23.0'
Merge branch 'develop'
Dont archive workflows in version close.