Optimize index (PR #14354)

GitHub