Merge development with production from 1.0.1 to 1.2.1