Merge remote-tracking branch 'drebs/feature/3397-keymanager-should-support-bundled...