Merge "2 updates to storing configs on disk"