Final 4.4.7 bug fixes (rebased onto develop)

See gh-478.