WIP2 -> WIP4

Merged Mark Vodyanitskiy requested to merge wip2 into wip4

Merge request reports