Merge branch 'rs/include-comments-before-the-function-header'