Merge pull request #3917 from hnyman/c571