Use interfaces instead of concrete classes

Closes #3607774

Merge request reports

Loading