Merge "Bug 4957: OF Role processing changes"