(cherry picked from commitsacdb8667b5and6733345f73) 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>
(cherry picked from commitsacdb8667b5and6733345f73) 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>