Merge development with production from 1.9.5 to 1.9.7