Fix caller bug.
Merge branch '4.1'