Golden file update follow-on for c37288f0b24c19813405096c087ab0c7c171c358