Merge development with production from 1.0.9 to 1.1.0