misc: Merge in 'hotfix-m5-tick-rounding-error'