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