Revoked r9665 as we need the configuration update in update SQL file to get the last ID for insertion