Merge "Bug 541849 - added common super RoomElement to model hierarchy"