Merge branch 'voxter-feature-3.18-crossbar-conference-details' into 3.18-voxter