Merge development with production from 1.9.0 to 2.2.2