In case you are not aware or have not yet notified by Toyota, Toyota has a pending Safety Recall 20TA02 that replaces the fuel pump (fuel pump is internal within the fuel tank). Do your technician a favor and schedule with a 1/4 tank of fuel or less.
See attachment;
FYI
Had the fuel pump replaced today on Orca under Toyota safety recall 20TA02. Dropped off at dealer at 8:45am received a call at 1:00pm was ready to be picked up. This was the dealers first FJ they replaced the fuel pump on under the service bulletin. The zero dollar invoice listed part numbers: 04009-86231 fuel pump kit and 04009-81630 kit replacement. Back on the road again with confidence.