Merge "When wal flag not enabled set db back to default" into main