Merge pull request #898 from mbargo23/bird19.07