BZ-13007 step 2 mark-up changes