Merge development with production from 1.4.1 to 1.4.5