restore some apis
Merge branch 'work'