Fix jobs didn't show bug
Merge branches 'master' and 'beta'