Merged in external spidy