(cherry picked from commit 6efabd3418) Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
6efabd3418