Merge
Revert "Merge"

This reverts commit b6dc598de09dc766592ffcd7decb4154d2cd82d7.
SQL Changes