Merging in external code from Cayman