Merge various recent fixes and enhancements to the package client toolset.