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