* backport of commit 3e64bcaf8371487c1cd32f2a9fa49ed0c5a065d1

* backport of commit 9b97cb7e877d8682d611d8c3fdd71f2da8e664f3

* backport of commit 2cb8b77a479af9fd89e6779dac76e1b09216eccb

* backport of commit dc66009a89c5f7256ffd66386561c0b5fb7c3c24

* backport of commit e00c4b0c9be086d2f281f782256783f0ce57fa0f

* backport of commit 7576a43d9c7b417ce8f41fc1ae498dc7cc7b57eb
Co-authored-by: tvsaru <tvsaru@gmail.com>
Co-authored-by: Loann Le <84412881+taoism4504@users.noreply.github.com>