Merge "Fixed NPE when local or remote port range does not exist" into sc-v2-dev