Role changes.
Merge remote-tracking branch 'remotes/upstream/master'
Tests
Fix for code review comment
....