Moved from rabbit-executor