Merge development with production from 1.0.3 to 1.0.4