Merge branch 'fix-logcheck-overflow'