Merge from fanzeyi/kaname