Merge "Introduce versions to XML for bubbles persistence" into rvc-dev