Fix bug on 2.0 branch.
Merge branch '2.0'