Merge "Fix a few issues with 616-cha-unloading." into pi-dev