Merge development with production from 2.2.4 to 2.2.5