merge some change in reman.

fyi.