Merge latest changes to this file from 3_7_BRANCH.