Merge "Update port profile only if defined"