Fix
Fix
Fix
Fix
Fix
Fix
Test
Fix
Fix
Fix
Fix
Fix
Merge branch 'cli' into cli-valyron.
Fixed merge conflicts.