see commit messages for upstream commits; didnt test yet hence draft
see also !6289 (merged) for dbus