The issue with old bootloaders and WDT has been solved, as far as I know. It (or at least the version for which there's source code - I have no idea what's in the .hex files) checks WDT status, and if it reset as a result of WDT reset, it jumps right to the app.