Fixing merge conflicts from 17b39e1126dc49fab02c5a61df7862627ec84eec in master branch.