* backport of commit dc342c6641aaf6a0dc72107ba3dbd2b95ab2d4a7

* backport of commit 7f9da9fd01818ef934475f0cd14803a96b253418

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