Merge "Remove references to legacy queue." into main