Merge "A few conference calling fixes:" into nyc-mr1-dev