Update dev with RC5 release changes

Updates the change log and syncs back ported bug fixes from the release branch.

The changes below look like they indicate the changes made to the release branch (even if they are already in `dev`).