Merge branch 'spike/relaunch_memsetingds' into spikes/jim