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