Merge development with production from 1.1.6 to 1.1.8