3.0e-snapshot patch and test