Integrated latest Catch changes, especially EOL issues