Merge remote branch 'spice/spice.v29.pull' into staging