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