BZ-12802 copied mark-up from production branch