Merge development with production from 1.2.1 to 1.2.5