Merge latest changes from branch 'master' into branch merge_36.