Merge branch 'nd/split-index-null-base-fix'