Merge "[COMMON] Allow use of second Node Port Prefix"