fix on merge

Merged Piotr Gawron requested to merge frontend-refactor into master

Merge request reports