BS-5060:reapply modification from BS-2737 that were overridden during a
merge from e4 or Datamanagement branch