Merge changes from 2.1.10-2.