Revert "merge cleanup"

This reverts commit ddd80d440d251c3670bccdd522d3b37dadc7b4f9.
Revert "Revert "merge cleanup""

This reverts commit bf781da7c7c69b123b08f7d05d0e8309893d9088.
Merge remote-tracking branch 'origin/master'