Merge from trinitycore