ROOMS-357: Improve features integration