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