Merge pull request #1366 from vhpoet/develop

[TEST] fix tests
Merge branch 'develop'