[20181104215125] Local Router Improvements and Bug Fixes