Merge "Update tox debug env"