Working on group leadership
Merge branch 'new-jobs' into unstable