routing spi changes

[merge]