Merge branch 'jn/bisect-coding-style'