Merge "Added geographical scope duplicate support" into rvc-dev