Dubious underscores
Snippets for op overloading
Merge branch 'feature/snippets' into develop
Merge branch 'release/6.4.0'