OS-13353 Multiple role management
OS-14787 Development/Unit Testing: OS-13353 - Multiple role management