Merge development with production from 1.1.0 to 1.3.1