Some user role verification
Merge commit '284158ddbc1a532d3492340f4162f5560e3424cf' into scheduler