Here is v3. I removed CATALOG_VERSION_NO change, so this should be done by the actual commiter.