Merge pull request #12504 from EricLuehrsen/unbound_ifauto