Merge "Allow to enable WAL for testing" into oc-mr1-dev