Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev