Merge Fixes from 2.x branch to 1.x branch.