Merge DEV into NewStyleCompany

Merged M3920 requested to merge DEV into NewStyleCompany

This reverts commit 52f1190c, reversing changes made to d45cd841.

Merge request reports