Merge of Markup Improvements