Merge "Roll to next snapshot version" into frankfurt