CLM-2486 and CLM-2839 image updates.