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