sondavidb:fix-snapshot-handler-override