merge qa-build-atlas-gen_sherpa-ma commit bc6cd812 from 7286313 Closes BMK-1325 See merge request !991