Merging SQL files to v3.3