Merge development with production from 5.8 to 5.9