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