Merge development with production from 2.4.5 to 2.4.7