Merge pull request #897 from mbargo23/bird21.02