Resolve BMK-73

Merged Domenico Giordano requested to merge BMK-73 into qa

Closes BMK-73

Merge request reports