Merge pull request #14382 from mikedn/dead-opers