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