Merge branch 'ab/coding-guidelines-c99'