Merge branch 'hotfix-2.3.6' into develop
Merge branch 'hotfix-2.3.6' into develop
Added missing comment about enabling the scheduler worker fixes #295
Merge branch 'hotfix-2.3.7'