Merge branch 'jc/coding-guidelines-decl-in-for-loop'