Merge 0.24.3 hotfixes

Merge release/0.24.3 into develop, thus integrating hotfixes applied in that release.

The commit view below is very dirty, blame not having a consistent branching model.
However, if you go to "Files Changed" view you'll notice the result of the hotfixes.