Merge "Return for getBlockedPorts NonNull" into main