Merge development with production from 1.0.4 to 1.0.5