Merge development with production from 1.0.0 to 1.0.2