More work on reconnectibility in Zephyr