Add marking support

ag7615requested to merge
feat-marking into feat-updates

Merge request reports