Merge "libsnapshot: v3 structural changes" into main