Addendum commit to include CHANGES.txt entry. (cherry picked from commit ce16541c62728f69634111dc2ddb321690d3d29b)