Merge 2.3.4 to master

This contains two fixes: DBUS-332 and DBUS-315. We need to merge directly to master instead of develop to make a release.