Merge "Refinements relating to invoke-custom"