Merged Yeshan's change.