Vol's commits, rebased to get rid of merge messages