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