Updated snapshot after 40dd1311274b5fd4b27ad46dab4da0a04fcc5441