Merge pull request #1658 from esdrubal/spgenerics