Merge development with production from 5.0 to 5.8