Fix initial checkpoint save#4697

Weves merged 3 commits intomainonyx-dot-app/onyx:mainfrom

small-checkpointing-logic-tweakonyx-dot-app/onyx:small-checkpointing-logic-tweakCopy head branch name to clipboard