Rebasing master into fast-dbus-open-message