Merge pull request #531 from Bohdan-Tereta/development

Issue #518 fixed
Unit tests for BTM and VU fixed
Merge remote-tracking branch 'upstream/development' into development