Merge "Replace custom HandlerExecutor with common one"