Merge "[Bugfix][T106BUG-350][T106BUG-336]fix status on api"