Merge "[RESTRICT AUTOMERGE] Fix bb in duplicate value for resource" into sc-v2-dev