Topic/default/merge refactor

More merge refactoring in progress

Merge request reports

Loading