Merge "Enabling WAL"