Issue #3443055 is being worked on the 1.1.x branch, see MR !89.
1.1.x
This archived one serves read-only purposes to manually cherry-pick code from.