Merge changes I95898fa6,I21e4b17e into rvc-dev

* changes:
  Prevent duplicates from persisted bubbles.
  Persists bubbles to disk (part 4)