Merge "Do not use defaultInstance for persistent repo" into main