TODO: new upstream snapshot
