Merge development with production from 1.5.1 to 1.6.1