Merge development with production from 1.1.2 to 1.1.3