Issue #3390940: Separate main components

Closes #3390940

Merge request reports

Loading