* backport of commit e0d23f4195623fd4a5ec1900f4fae488478667da

* backport of commit 0fd1e6fbf10d7601660fcabaa00aa402e360f3b1

* backport of commit 492b422b69c5d4f9f697dffa13a10c7c03cc2377
Co-authored-by: Chris Capurso <1036769+ccapurso@users.noreply.github.com>