Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev