Merge pull request #2462 from vlakoff/develop-4

Fix tests execution