Added support for more backendfs.
Merge branch 'test' into dev