Merge branch 'feature/jobs' into 'develop'