Merge pull request #1210 from jmaas/master

Multiple fixes to snippet regressions