@damyan.mitev please review
mentioned in commit 32acc6b4
mentioned in merge request !40 (merged)
mentioned in commit 72186e26