Merge in r8653-r8696 from trunk; cope with Validate method in invocation handler
Authored by: stephenbayliss 2010-07-14
Parent: [r8700]
Child: [r8702]