Porting all files from 1.7.2.