(cherry picked from commit b2a8487684) Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
b2a8487684