Merge master and Dynamic Roles Implementation