Merging si-spill-fixes-v3 to master