Merge pull request #17010 from pprindeville/bind-update-9.17.19