impl admin jobs
Merge remote-tracking branch 'master/master' into master2