Merge development with production from 6.8.2 to 6.8.4