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