Merge development with production from 1.9.1 to 1.9.4