Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> (cherry picked from commit 57d737a13c9e7484753d796407582a9a3997d7d2)