Final 4.4.7 bug fixes (rebased onto develop)



This is the same as gh-478 but rebased onto develop.

----

See bug tickets:

   - #10611
   - #10623
   - #10647
   - #10699
   - #10610
   - #10622
   - #10734
   - #10621
   - #10634
   - #10566