Closes MIN-46
requested review from @KonradAt
approved this merge request
enabled an automatic merge when the pipeline for b8b0db70 succeeds
merged
mentioned in commit 7c77b546