Merge "Remove CONF values from images clients"