Some patches are already upstreamed. Signed-off-by: Nick Hainke <vincent@systemli.org> (cherry picked from commit b2272c6194666a299210a0ee1bf307c83abc278b)