Merge branch 'ds/sparse-updates-oob-access-fix'