Merge "Fix NPE when pfd is not present" into main