Commiting before cloudsegmenter refactoring