(cherry picked from commit acdb8667b5)
Adds some more fixes for 4.5.
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
(cherry picked from commit acdb8667b5)
Adds some more fixes for 4.5.
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>