Merge "Fix gcc-11 compile error at dbus.h" into devel/master