Merge development with production from 1.0.8 to 1.0.9