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