Merge "Fix off by one error in log tracking" into jb-mr2-dev