Depends on https://bugzilla.freedesktop.org/show_bug.cgi?id=106055 and https://bugzilla.gnome.org/show_bug.cgi?id=795275