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