Merge "eg_developer role added"