Merge "Increase the duplicate detection timeout for reliable messages to 3 seconds" into main