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