ROOMS-261: New fix
Clean agent filter arrays
Merge branch 'master' into rooms-264
Round 2