Merging in snbuback changes, to test.