Merge development with production from 1.0.7 to 1.0.8