Merge remote-tracking branch 'vantoman2/quartz-new' into quartz