This is merged upstream, so we'll be able to drop it soon enough. [ci:skip-build] Already built successfuly on CI in MR
Newbyte