Merge "Add version control for packet address translation design" into main