Merge latest changes from branch 'master' into merge_36.