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