Merge development with production from 6.0 to 6.2