Fix/timeout

Closed Hermann Owren Elton requested to merge fix/timeout into dev

Merge request reports