Router update 2

Merged Titus Netland requested to merge router_update_2 into main

Merge request reports