Merge "libsnapshot: update opcountcheck" into main