Обсуждение: Feature test intermittent failure fixes

Please find here attached patch for feature test fixes, there fixes are related to intermittent test case failures.

Please review the patch and commit.