Merge development with production from 1.1.4 to 1.1.5