Merge "Improve validation for invoker management"