Bone pickings and sauce

Mostly some stuff from 2.1 that applies here as well ... 

Includes the SSI update that we help off some time ago, I did get Nao's OK that there is no conflict with that code.