Merge branch 'th/bisect-skipped-log' into next