fix route at identity switch
update test
Merge remote-tracking branch 'origin/dev' into dev