Merging in changes from PICES