Merge branch 'documentation-snippets' into develop