Merge development with production from 1.1.7 to 1.1.8