Merge branch '1675-fix-roles-validation'