Patches 383 and 384 were merged upstream. Patch 385 was partially merged upstream, the PR with test is still open.
Miro Hrončok