Closes MIN-162
requested review from @KonradAt
approved this merge request
merged
mentioned in commit 8ba136f9