See merge request !48

This reverts commit cc96c967.

See merge request !46

See merge request !44

This reverts commit 6698530a.

See merge request !43

See merge request !42

See merge request !41

See merge request !40

See merge request !39

CPU load can spike significantly thus it is unpredictable the timeout.
To be on safe side and avoid false positives increase timeout.

See merge request !38