Closes MIN-57
requested review from @KonradAt
approved this merge request
merged
mentioned in commit ff1bb008