Merge branch 'master' into refactoring-JobParser