Merge "Remove BubbleEntity via IDs" into rvc-dev