Merging oysterbanks changes.