BZ-12802 copied mark-up from production branch
Merge branch 'Sprint74-DV' into integration

* Sprint74-DV:
  BZ-12802 copied mark-up from production branch