Passes along phase1Timeout payload in all places
Merge pull request #1713 from tinwelint/2.0-p1-payload

Passes along phase1Timeout payload in all places