Merge "Initial version of compatibility WAL"