Fix a bug that would add updated control ip address instead of replace
Add the static nat rules to the merge procedure