Merge branch 'bp/read-index-from-skip-verification'