8.5 snapshot merge ajrodriguez 8.5 snapshot columns