ROOMS-333: Include minor changes from ROOMS-297