Implement two markups work

Denis Brekhunov requested to merge implement_two_markups_work into master

Merge request reports