Merge development with production from 1.6.1 to 1.7.1