part of #3326 

@ggwpez @Kianenigma @shawntabrizi



---------

Signed-off-by: Matteo Muraca <mmuraca247@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>