Add disk APIs
Merge branch 'dev'