BZ-12960 Fix for markup