This is merged and in tests-passed.
Let me know how it goes for you, I’m online few more hours and can fix more if needed.