Merge development with production from 1.0.5 to 1.0.6