Merge enhancements from trunk, especially the CLI fixes.