Merge "Don't assume that transport unbind == transport invalid" into klp-dev