Merged in changes for Cognionics.