CLOUD-24: shell in synch with snap