* backport of commit 9c32be69f87b8b2195c47f8ff3e132a4176519ea

* backport of commit e194b26ce52d69701cc7c656c653bb85fa0ee030
Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com>