Co-authored-by: Fabio Alessandrelli <fabio.alessandrelli@gmail.com> (cherry picked from commit cfcdd576dd)
cfcdd576dd