CLC-4230 - Handle possibility of UID/SID overlap