Fixes for record cluster merge, PAZ-901