Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit 89cbb28f64b3406164e61cd1fcd7504a89b6e8fd)