Merge "Nits following invoke-custom support"