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