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