Merge branch 'hotfix/sortfix'
Merge branch 'master' into develop
Adding error log for failure in getJobs
Merge branch 'hotfix/getjobserror' into develop