Closes MIN-154
requested review from @KonradAt
approved this merge request
merged
mentioned in commit 5be6e598