Merge development with production from 1.1.8 to 1.2.0