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