Merge fixes
Revert "Merge fixes"

This reverts commit 15a37391caf5b505743f5bcdcef750eca14448fd.