Merge "Update CLAMP images tags"