fix router "disable"
sync
Merge branch 'master' into updateconf
should work with disable keyword