Merge pull request #17686 from demeritcowboy/medium-index