Merge branch 'dbus-1.6', rejecting reversion of #38201