Merge "[COMMON] Fix problem with useNodePortExt"