- Add 5 second short dumps to watchdog (#1314)
- Rebuild merged patch file