Merge "fix issue where players would be wrongly dismissed" into rvc-dev