Adding 1 second MIN Timeout.
Merge branch 'CLB-380-MinTimeoutReset' into 1.21-candidate