fix to duplicate short_id creation problem for resource
Merge branch 'hs_core_bug_fix' to address duplicate resource creation