merging development into chico-dev