Merge multi enums feature to master