Merge development with production from 1.9.4 to 1.9.5