synchronization with library-service branch
Merge branch 'master' into multidirs
RunActivityAction has gone
Merge branch 'master' into multidirs
cleanup
Merge branch 'master' into multidirs