Wip3

Merged Mark Vodyanitskiy requested to merge wip3 into wip4

Merge request reports