Fixed issue about sp type.
Merge branch 'develop'