Merge "Handle null PFD." into main