Merge development with production from 1.0 to 1.1