Merge "Introduced DISABLE_COMPATIBILITY_WAL flag" into pi-dev