MED-217 - Fixing up merge issues.
3 files changed