Merge "Fix raname behavior"