Merge development with production from 1.3 to 1.4