Resolve BMK-74

Merged Domenico Giordano requested to merge BMK-74 into qa

Closes BMK-74

Merge request reports