Merge branch 'rs/discard-index-discard-array' into next