Reverted changes made for VU
Merge remote-tracking branch 'upstream/test' into development
Merge pull request #194 from Bohdan-Tereta/development

Reverted changes for VU  from pull request #192 since they aren't needed.