Partially merge in changes from router clean