(cherry picked from commits acdb8667b56a43db6eee9a96ad61147bb80ea785
and 6733345f73d04aeca9fa94706ca7451a72433429)
Adds some more fixes for 4.5.
Co-authored-by: Lukas Tenbrink <lukas.tenbrink@gmail.com>
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>