Merge remote branch 'spice/bugfix.2' into staging