Some room management functional.
Merge remote-tracking branch 'origin/master'