Merge "wfTimestamp should not die on bogus input [Regression]"