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