8.4 snapshot merge2