Rebase fenix patches to fenix v89.1.1
Closes #40169 (closed).
There were a few conflicts in the 89b5 -> 89.1.0 rebase: #40168 (comment 2737487)
And no conflict in the 89.1.0 -> 89.1.1 rebase.
Closes #40169 (closed).
There were a few conflicts in the 89b5 -> 89.1.0 rebase: #40168 (comment 2737487)
And no conflict in the 89.1.0 -> 89.1.1 rebase.