Copyright added (also rebased on latest rbac branch)