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