Merge development with production from 2.4.3 to 2.4.5