Feature 4120

Merged Benjamin Baer requested to merge feature_4120 into master

Removed Timeout as per #4120

Merge request reports