Resolve BMK-1142

Closes BMK-1142

Merge request reports