Merge "Do not use hidden HandlerExecutor"