(cherry picked from commit 41c563bf68) Co-authored-by: Antonis Stamatiou <stamatiou.antonis@gmail.com>
41c563bf68