Revert "Removed a lot of changes for merge"

This reverts commit 5c3bdf019b279ab39e77a11e21320aa696565680.