CLIMATE-467: additional debugging