Merge development with production from 5.9 to 6.0