Closes MIN-22
requested review from @KonradAt
approved this merge request
merged
mentioned in commit 66953e4c