Merge branch 'jc/coding-guidelines'