change build opt

Merged Domenico Giordano requested to merge BMK-64 into qa

Closes BMK-64

Merge request reports