Merge branch 'main' into feat/checkpoint-list-json