Merge zhaocal's changes