Merge "Fix MonotonicClock persistence" into main