Merge pull request #4612 from JemimaBrewer/release/4.0