this closes patches item 429136 and brings the release21-maint version into sync with the head branch.