Sync with OpenWRT trunk r43718: Dry run