Hi, If possible please test attached patch in PR 273210, all known reported issues have been fixed upstream and shouldn't cause any issues but feedback is welcome.
I'm aware 2.12 is out but let's move to the latest 2.11 release for now as moving to 2.12 will require additional work. Best regards, Daniel