Merge "ContentSuggestions - restore snapshots when needed" into rvc-dev