Merge branch 'fc/doc-style'