Merge development with production from 1.0.2 to 1.0.5