Merge branch 'spice' into cw/master