Merge branch 'issue/2036-job-monitor' into 'develop'