Incorporate last version 4 changes into v4.x branch

Why is this change being made?

Now that the master branch contains major version 5, we can no longer release version 4 from master.

This MR brings v4.x up-to-date with the latest version 4 changes that made it to master since the branch was created.