Merge "Revert "Allow MAC addresses to configure IP configurations"" into main