Merge development with production from 2.4.0 to 2.4.2