Merge "Match players based on notification key" into rvc-dev