Merge "Revert "Refinements relating to invoke-custom""