Merge development with production from 2.3 to 2.4