Changes to makefile snippets useability
Merge branch 'release/6.11.0'