Issue #5600: Advanced compression repair