Merge branch 'master' into spill-reload-2