Sb/tf issue 81 v2

Rebase of sb/tf-issue-81 on top of vk/tf_issues#133_V3