Merge branch 'cherry-pick-3b3879e4' into '1.2-fixes'

Merge branch '5774-add-artifcats-to-build' into '1.3-dev'

See merge request fusiondirectory/fd!232