Merge branch 'main' into fix/1374-enable-fetch-checkpoint-remote