Merge pull request #4370 from TranceLove/feature/room-2.6