- Merge patch.
- Test case needed update because event number were off.
- Error code has changed because db name validation rules
  changes between 5.0 and 5.1