synchronization with library-service branch
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta