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