Added snippets for generic includes
Merge branch 'release/6.1.0'