Updated snapshot after 64f2ac27d3024fe792167c142bdf0c5459e09d5d