BZ-9866: markup changes