(cherry picked from commit d7aed4102d) Co-authored-by: Emanuele Gaifas <lelegaifax@gmail.com>
d7aed4102d