more precise assertion
Merge branch 'snapshot_type_adapter'