Merging checkpoints from 8.7.4 including image enhancements & fixes.