Document changes in #7968
Merge pull request #9317 from balexand/patch-1

Document changes from #7968 in Upgrading Guide