Merge "Minor fixes to Verlet kernels" into release-4-6