Merged in string db branch