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