Merge branch 'delegated-roles-with-backend-connectors' into dev

Change-Id: Iabffc101a480478c0e77e6c5295504106f7e389a