Fixed the userstate delete issue
Merge branch 'pt78250148' into develop
Merge branch 'develop'