Updated set-space-role to take ORG param
[#57031448]