Merge pull request #22797 from totten/master-queue-spec