Merge "Persists bubbles to disk (part 1)" into rvc-dev