Add changes.rst updates from 4.0 branch.