Merge "Fix missing receiver type information in invoke-custom"