Merge "Fixing conference managment regression." into lmp-mr1-dev