Merge "Fix port update"