synchronization with library-service branch
RunActivityAction has gone
cleanup