Development primo4

Update with changes from and for Primo 4.