Merge development with production from 2.2.2 to 2.2.4