Backport Role Manager fix