Fix bug when sprt contains state key
Merge remote-tracking branch 'origin/master'