Merge development with production from 1.1.5 to 1.1.6