Closes MIN-116
requested review from @KonradAt
added 1 commit
Compare with previous version
merged
mentioned in commit eb2236f2