Upgrade Quartz to 2.2.3
Merge branch 'feature/upgrade-quartz-to-2.2.3' into develop