Merge "Move inactive user filtering to its own filter" into rvc-dev