Updated RouterAlertHandling branch

This pull request includes an updated version of the topic/router-alert-handling branch merged into the newest master.