Merge pull request #2646 from reaperhulk/static-callbacks

Static callbacks