TrinrtyCore commits merge