Pull changes from longlongji