Merge development with production from 1.2.0 to 1.4.1