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