Merge in parallel pfaffian changes from 4d