Merge "update in invoker manager"