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