Modify QUICK scheme for velocity
Merge branch 'quick'