I wanted to wait until it is merged upstream to backport it right afterwards, just to be sure it won't change anymore