LPS-51765 Unable to remove regular role
LPS-51765 Add namespacing for globals