separating RID and SID concepts
Merge origin/master
separating RID and SID concepts