Resolve BMK-8: discussions resolved

Merged Lorenzo Rinaldi requested to merge BMK-8 into qa

Closes BMK-8

Merge request reports