(cherry picked from commit 46eec85b1a) Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
46eec85b1a