FL-1295: dbus-glib fork, work in progress