Merge chico-dev with evan-dev