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