Merge pull request #15421 from artfulrobot/queue-safety