Merge pull request #4871 from EricLuehrsen/unbound_control