Merge remote-tracking branch 'spice/spice.v68' into staging