Merge snapshot improvements from the Sourcefabric branch