Merge "Only return non demoted conversations" into rvc-dev