Merged latest changes torwards 4.2.

Markus Scheidgen requested to merge migration into master

Merge request reports