Merge "Update path for SnapshotMergeReported." into rvc-dev