Merge "Include original exception when throw TimestampException"