Merge "delay: timeout detection support" into integration