Merge "Minor improvements for invoke-custom"