- deactivated tests
Merge origin/master