Merge branch 'jk/coding-guidelines-update'