Merge branch 'hv/coding-guidelines'