Use correct id codec on resolution and on simplification
Merge branch 'mbst-9316-events-ingest' into stage