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