Merge development with production from 1.0.6 to 1.0.7