Signed-off-by: Alexander Borsuk <me@alex.bio>
Pre-requisite to fix #1723 Signed-off-by: Alexander Borsuk <me@alex.bio>