Commit from local 2 SQLEnum
Conflict resolution 3
Revert "Conflict resolution 3"

This reverts commit 615fe32c04009d8d9ab121cab4f80f69ceaa75db.