Co-authored-by: Ambroise C <ambroise.christea@sonarsource.com> (cherry picked from commit 441a87e76b)
441a87e76b