[#PRX-249  Fixed Issue and added missing role selection]
Revert "[#PRX-249  Fixed Issue and added missing role selection]"

This reverts commit ede881e2be2f4d42f2cd0a2e01fb9864dda3c54f.
Revert "Revert "[#PRX-249  Fixed Issue and added missing role selection]""

This reverts commit a25cda1b39bccc889ec37e5ce3ff44bf0c8731aa.