Merge

all these tests pass, please merge it.
Please just see "Files changed", the commits doesn't make any sense.