Stage commit:
Router modified
Static address page merged in
Topic page merged in