Merge pull request #6707 from ElbertMai/fix_vxlan6_ui