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