Closes MIN-112
requested review from @KonradAt
approved this merge request
merged
mentioned in commit 949631af