Merge pull request #2103 from xen2/calli_generic