Merge branch 'feature/zeroTimeoutHandling' into develop