Squashed commit of the following:

Issue #3517969 alternate approach prep an interface change for 12.x"

Issue #3124304 only fetch queue item data when you make a successful claim

Closes #3517969