Merge development with production from 6.8.0 to 6.8.1