Merge branch 'hotfix/robb/fixsmoothchunker'
Merge branch 'release/virtual_odometer'