Merge pull request #15542 from demeritcowboy/upgrade-convert-autoassignee-2