more cleanup on snap
Merge branch 'master' into stable