nvda

94e26a39 - Beta to master (#18002)

Beta to master (#18002) Co-authored-by: Jani Kinnunen <janikinnunen340@gmail.com> Co-authored-by: Sascha Cowley <16543535+SaschaCowley@users.noreply.github.com>