TEZ-1219. Addendum. Fix roles. (hitesh)