Merge "[part1] Remove six"