BZ-12025 mark-up cleanup